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

* commit '3fdc800719d010c5261e6d7a6c559a6bbf009cf0':

Change-Id: Ic332edfc8e2431858430209ae23f4fbcdc865554