Merge "Fix PreSimpleSaveActivityTest" into rvc-dev am: d591c45cb6 am: 473433d960 am: c183a12070

Change-Id: I712fa0eba5746cc8f51e8fa6bc3e37d351b0d776