Merge cherrypicks of [1330941] into sdk-release

Change-Id: Icccef757be1b41a4d11dd3e1ea6d92447917f099