Merge QP1A.190122.001

Change-Id: Id7acb995b193336503138453d08004d58655611f