Merge QP1A.190107.001

Change-Id: Ia857afadd307acd3cb8b8dae23d1d26704a20af5