Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
am: f4ca410ad7
am: 28153ffaa7
am: 3d20254943
am: 43699ecba2
Change-Id: I53597dca77706f4e2a748f72bb7e20f1950cf8ca
This commit is contained in: