Commits
Scott Main authored ebcee19783c
Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later. This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392. Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2