Merge android-msm-wahoo-4.4-qt-qpr2 into android-msm-wahoo-4.4 SBMerger: 284775313 Change-Id: I5dc5484b0616cffb2e227fa5277e5bd3263becf9 Signed-off-by: SecurityBot <[email protected]>