Merge changes from topic "128616035"
am: bd71d6f862

Change-Id: I7089f69a29be4bbf6758f4548201222fa7422715