Merge QD4A.200805.003.

Bug: 160260413
Change-Id: I5342fa1d6072fba9d3d57d09f9e03ed62f60e50c
Merged-In: I60adea4d9a0d174244b2441ce14093daf5c20efb