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