Merge \\"Update manifest shortcut XML schema\\" into nyc-mr1-dev am: a65d8b6609
am: 5a533c9ae3

Change-Id: If46b8c1763b3682c780dcbaef1a790c1a5b9ded6