Merge QD4A.200805.003.

Bug: 160260413
Change-Id: I008bfe61c4819d1b58cd8ba3b8a18be18ab2bec2