Merge "Merge "Added logging for setting mMotionAborted in NPVC" into tm-qpr-dev am: 3d50899537 am: 9002fa2254"