Merge "Fix application manifest XML" into mnc-mr-docs am: c8dcc2b am: 3fdc800
am: fc688ec

* commit 'fc688ec32eaf5815ce3f1ccba6023d5290b8d336':

Change-Id: I35f3641ad371da743a2159eaf14e704b7ff229c2