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

Change-Id: I9b91550747e2b6c06882c3983f5c32a0cba8d9b2