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

Change-Id: I650482da0ea8bfeb81ba562b316859b94ce21ef3