Merge QP1A.190625.001

Change-Id: I6a2184ad7ec5f6aedcbfec76420579e3f31a157a