Merge cherrypicks of [13187559, 13187596, 13187597, 13187383, 13187384, 13187520] into sc-release

Change-Id: I8a95bbd70b263b2173ee2a07b317036478cd1b5b