Merge changes from topic "image_space_loading_test"
am: e45918a823

Change-Id: Ia676facb546001b72a578253c01e4b6fefeadd37