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