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

Change-Id: Ice40ca19b55cd92bbe77183364b17542db19041b