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