Merge cherrypicks of [14531309, 14531310, 14531311, 14532536, 14532561, 14532837, 14532838, 14513238, 14532984, 14519595, 14530898, 14530899, 14531549] into sc-d1-release

Change-Id: I6c5acaf7c743e7b9f65f61d2f423de68b64ec7b5