Merge QP1A.190107.001

Change-Id: Ibe80b4fcf0decfa79f5fda304a22449ed6a7b852