Merge QP1A.190228.005

Change-Id: I6a655394bc93b72e79aef37cfa856b6a8db393f6