[automerger skipped] Merge "Finish mocking in finally clause" into rvc-dev am: 5c5a6898 -s ours
am skip reason: Change-Id I95cc24e789c5af5f655c875314ed97f50121166c with SHA-1 61fd9f9a is in history
Change-Id: Ic0fa619084b887d7a71cffa4200cfda71904f2ee