mod for merge

Change-Id: Ic5003a2e1fac25e002417e5fd915225627f36d1a
Merge branch 'jb-mr1' of https://github.com/pcarenza/platform_manifest into jb-mr1

Conflicts:
	default.xml

Change-Id: I657d5848983b264c63682c12268a6fb6813e0c04