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