Merge cherrypicks of [5556008, 5556009, 5556010, 5556011, 5556012, 5556013, 5554791, 5554792, 5554793] into pi-qpr2-release

Change-Id: Id54d441b279a0b34f54da8c742f4696f7eb46b31