Merge changes from topic "libsnapshot_api_update_engine" am: bd122aa9c2
am: 2c1485a8a4

Change-Id: Ia95c1dc99a44b4be50eeb0c76e1de50ad496f8ec