Merge changes I8b56e58b,I709db10c,I398f1d86,Ifdc05e6b into qt-aml-media-dev
am: 502acbeb76

Change-Id: Ie8e9d724dc23811d538700004737187612c2c639