Merge android-msm-wahoo-4.4-qt-qpr2 into android-msm-wahoo-4.4-qt-qpr3

SBMerger: 284775313
Change-Id: I0e3bf310f094e4b73756431da3fbeba41260f792
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>