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