[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 -s ours am: 373ceaf4 -s ours
am skip reason: Change-Id I95cc24e789c5af5f655c875314ed97f50121166c with SHA-1 61fd9f9a is in history
Change-Id: I607b16098bd71bacac647599bfbe64b5e7a60e71