[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 am: 41650bbc am: 03e1727c -s ours
am skip reason: Change-Id I95cc24e789c5af5f655c875314ed97f50121166c with SHA-1 cd8b0633 is in history
Change-Id: I04054f5a9f7ce0ea65f0fcd8c16baf89b70652f6