Merge QP1A.190228.005

Change-Id: I174d045d5af63dc1213c267ca83a2ed1fbbbb1af