Merge changes from topic "bug124232146_move_MimeMap" am: ece56fc6ce
am: 610dcc12d4

Change-Id: I3df218f5a2c37619b401d35623fa5e287cdb8f3b