Merge "Adding Error Check For PictureStructure Param" into mnc-dev am: eff6110334 am: 3c36499287 am: d92545af0f am: cd24c753d4 am: 0c7a52f296 am: a77a9a225c am: daea1b9afc am: a84d3d0c8d
am: 01597acaf2

Change-Id: I4e75ad5d5a7f5aa62637666628ffaaf30d588511