Merge changes from topic "libsnapshot_api_update_engine"
am: bd122aa9c2

Change-Id: I283453298ba0db7d462413a4e427cec83c16bf66