Merge changes from topics "118348832", "120945564"
am: 52a31598e7

Change-Id: Ib236b90d107ec7fa40c32c9604af95f58b844e05