Merge cherrypicks of [6391991, 6392011, 6391992, 6391993, 6392031, 6392051,...

Merge cherrypicks of [6391991, 6392011, 6391992, 6391993, 6392031, 6392051, 6392052, 6392091, 6392111, 6392032, 6391994, 6391995, 6391996, 6391997, 6391998, 6391999, 6392000, 6392001, 6392002, 6392003, 6392004, 6392005, 6392006, 6392112, 6392113, 6392151, 6392152] into pi-qpr2-release

Change-Id: I3808395b49e1416d2f5107d926b1b713e17828b7