Merge "Update MDX mapping" into pi-dev
am: f651a215f4

Change-Id: I625975f938b75a392109982d540fd32be76022c5