Merge cherrypicks of [2480357, 2480488, 2480426, 2480504, 2480559, 2480579, 2480505, 2480507, 2480427, 2480317, 2480474, 2480358, 2480489, 2480490, 2480475, 2480476, 2480580, 2480508] into mnc-mr2-release

Change-Id: I059960c0218cd1e4e587a69695da3703c73dc4e9