Merge changes from topic "libsnapshot_api_update_engine" am: 7509fca99a am: 98af6698b1 am: f64ef0b747
am: 91d4b5ddef

Change-Id: I66016c15f3eca85e2fa379b65cea86850b2dfc19