Bring in Note 2

@T-Macgnolia

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Merge branch 'jb-mr1' of github.com:TeamHorizon/platform_manifest into jb-mr1

Conflicts:
	default.xml

Signed-off-by: iceandfire <arhamjamal@gmail.com>