Merge QP1A.190228.005

Change-Id: I491a43c60df3257cb94aa019a8a545bde7fb6882