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

Change-Id: I3bc16a14cb161d4f860da8cc3a8d618db0b917d3