Merge QP1A.181119.002

Change-Id: I725f7efbaa3d2ae01d378fd3cca4921b98a34f95