Change-Id: I7472248777bcff01a8db3be707c19dfab098213a Fix: 142834800 Test: the reproduce steps in b/142834800
147d162e10
256948b814