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

Change-Id: Ie6db511dfdf9f2f8a14561259f54c7a07f0bfd84