Merge changes from topic "libsnapshot_api_update_engine" am: e71efc3dc4 am: f471637e19 am: f0682381d7
am: 8e3f6e33eb

Change-Id: I7ebb6e0cedf5e93935e4c7871d4821f13ea2d70f