Merge QP1A.190228.005

Change-Id: I1814265c957f37079f4f5241d62da240a590189c