Merge QP1A.190228.005

Change-Id: I9ba28292ef1c85d10f845ad47ec9da7e1c5286f4