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

Change-Id: I52fa7a18545f5e5bee64314cd47f8f6cb026f0a3