Merge QP1A.190122.001

Change-Id: Ia6d8635401a6382197c83efb05ced0805626ebd9