Merge changes from topic "128616035"
am: dc4d14b37a

Change-Id: I0f9807127cdd46079a969532bdeb121bf544921d