Merge "Use null error_msg for pic images"
am: ade40116a8

Change-Id: I4cb0250babbb838dff4229c786ec8cba03120f61