Bug:36847782 This reverts commit e5549d414c7231ee0037cf413dad17e28b8905ba. Change-Id: I38f1c501b7e40be11ba5f0a7a50651e0c3e41fc5
Bug:36847782 This reverts commit e5549d414c7231ee0037cf413dad17e28b8905ba. Change-Id: I38f1c501b7e40be11ba5f0a7a50651e0c3e41fc5