Merge QP1A.190228.005

Change-Id: Ifa55a88781be935e4b128c117694337d72027164