Merge QP1A.190228.005

Change-Id: Iad3abf0e83fc3342bf8d1563d186b2bf8e6e7bb5