Merge changes from topic "revert_save_info" into pi-dev
am: 4dddd61fa8

Change-Id: Iff89691076a2136bafa1130f97cb71fa1177737d