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

Change-Id: I8d699b2f66700008c958b7a8261015468c62861c