Merge QP1A.190609.001

Change-Id: Ie74b319cd8c70a88d7223d4647ba3d40476b2b36