Merge "MAP MCE null pointer" into qt-dev
am: 51fc2ecf50

Change-Id: Ie81c74a5e7852cc6d63b394c309fda7cd50c8c8e