Merge QP1A.190228.005

Change-Id: Idaa74cfd669aa0230d2a5c2449fa6afc39c5785b