Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7f am:...
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7f am: f4ca410a am: 28153ffa am: 3d202549 am: 43699ecb
Change-Id: I53597dca77706f4e2a748f72bb7e20f1950cf8ca