Merge QP1A.190530.001

Change-Id: Icbed576494e6b8c4159df4c83504641e381b096a