Merge "Update the contract docummentation regarding  UnsupportedOperationException." into qt-dev am: 04e3a27c12
am: b1a497c4a3

Change-Id: Iad265794f3a95907014619a106cf7c3142295df6