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

Change-Id: I9090403f14934875e85ce896d60927bc4c9732bf