[automerger skipped] db845c: Sort manifest.xml entries am: 5387f5a37e -s ours am: 106a809245 -s ours
am skip reason: Change-Id I4a8dfd4a17aa5d8ea343e851b50f0d7da49de033 with SHA-1 0cf8ff03bb is in history

Change-Id: I35c90f2491b4df408472bbef03eb39d4fb18f60e