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

Change-Id: Ib7e1b48958a5a92dbf5bb10eb3fc58b9baa8f242