This reverts commit dd6f844129. bug:22632129 Change-Id: Ibd4b9c35b66cb7d877085bc010fde45a682ba34f
dd6f844129