Merge "fix monkey error in updateStorageHint" into camera-SnapdragonCamera.lnx.2.0