Merge "Fix PreSimpleSaveActivityTest" into rvc-dev am: d591c45cb6

Change-Id: Ic7f45df0c81fd478edb57923aed2e6d813c51cbd