Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: 022790b197 am: 5d89b0f2ec am: f10a92d8a6
Change-Id: I2bbc09e37b87163bf89943e5c78e5bf50ba1c42c
This commit is contained in: