Merge QD4A.200805.003.

Bug: 160260413
Change-Id: Ia5b4cd8b3e4f152ccc4115294147dccfa6514b87