Build with core_current am: 48ddf9e8c1 am: 58403e054b
am: ba28448456

Change-Id: Ie8829f517b3a7990bdd1b85fe91caf4b954cb4bb