Merge changes from topic "126637721"
am: 9763d788ef

Change-Id: Ia1b93ffad154d8e149d172dd7694b4c58add03a9