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

Change-Id: Iea03a211cc1e9599583620b263ee3e89ee806448