Followup CL will delete the dead code. Bug: 29461092 Change-Id: Iaf96184219b7b052b7a8d97f403afec236d28437