Merge "Adding Error Check For PictureStructure Param" into mnc-dev am: eff61103 am: 3c364992 am: d92545af am: cd24c753 Change-Id: I22c59e64e2bb3e5992c5fe744dccd409bd5c0ff3