Merge commit '88c0af88' into mnc-dev...

Change-Id: Ib5a797e9a54ab1d447d84a57a209b32c4839b8c3