Merge QP1A.181119.002

Change-Id: I5a4415deec0a7c4cd03836d1aa1df06d3bf9c0ff