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

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