Merge QP1A.190324.001

Change-Id: If53565d100852ddf77408be23c8ad2d4bf7e4c08