Merge changes from topic "126637721" am: 9763d788ef
am: 4b8ef66c0e

Change-Id: Ic9b2fb8e4dbe3f84579e926f4ac8d2fc3b8b9e1c