[automerger skipped] Merge "Finish mocking in finally clause" into rvc-dev am:...
[automerger skipped] Merge "Finish mocking in finally clause" into rvc-dev am: 5c5a6898 -s ours am: 883e3ab8 -s ours
am skip reason: Change-Id I95cc24e789c5af5f655c875314ed97f50121166c with SHA-1 cd8b0633 is in history
Change-Id: Ie69569469f803b65d92f3948b08657ba000c45f1