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

Change-Id: I7f7b88bb468e608e28ecb2af3b2455ae75e812af