Merge QP1A.190228.005

Change-Id: Ieb84e9a0dbfd9a1dcfe6140aa67dbf781d8b016d