Merge "Add a test to perform block_image_update" am: 881b08ecd2
am: 5c06706d51

Change-Id: I8d8961b0db84e7cedf12e0505d62f7321aace9ed