Merge cherrypicks of [6452478, 6451642, 6451643, 6453811, 6451644, 6451645, 6453831, 6453851, 6453852, 6453853, 6453854, 6452479, 6452480, 6452481, 6452482, 6452483] into oc-m8-release

Change-Id: Idf6f62c5129af560787f0f496a97ba2ffab87671