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