Merge changes from topic "bug124232146_move_MimeMap"
am: ece56fc6ce

Change-Id: I7bafaaaf11776689fa1846e15340bd63614eefbc