Merge cherrypicks of [3478238, 3478653, 3478239c, 3478580, 3478612, 3478240,...

Merge cherrypicks of [3478238, 3478653, 3478239c, 3478580, 3478612, 3478240, 3478654, 3478655, 3478656, 3479494, 3479495, 3478933, 3478934, 3479496, 3479497, 3479498, 3478160, 3478161, 3478162, 3478876, 3478877, 3478878, 3478241, 3478163, 3478164, 3478165, 3478166, 3478167, 3478168, 3478169, 3479990, 3479991, 3479992, 3480010, 3480011, 3480012] into oc-m2-release

Change-Id: Ia25b4308ed0e59b88d02d2b7388addb421cb99c2