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

Change-Id: I98e291c2b316d5dea27603351ad9acfba033f677