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

Change-Id: I7bfaa0153d967a9faca5834d593f886b0e989a63