Change-Id: I35caf1480e0f76f5f3a53528af09312e39414bbb (cherry picked from commit a90471b3e65326cc18ed31fe21aef654833b5883)