Merge QP1A.190107.001

Change-Id: I8246a9da8b7a5f454f3a356921fe9b7747f08c51