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

Change-Id: I0844d7139ff72f9c0fc1420eee179592d53c3379