Merge QP1A.190107.001

Change-Id: I6ab0f3a46741d377e9f247a102eb25955ef07e98