Merge changes from topic "am-229ac1d6a1a44071a18b9bc8c1d30196"
am: 2545655fe2

Change-Id: I6de2328b24dde04e576f29bbcd6e5027d636e715