Merge QD4A.200805.003.

Bug: 160260413
Merged-In: Ifd8c06d886522afd22671614835b39b86e8545e8
Change-Id: I749bd729830bb9fb6362aa5e68ac5b5b00157b9d