This allows some cleanup and removal of dead code. bug:15489928 Change-Id: Iaf0507bc2e8ec6dcc253f01f61c5b221d46581f9