Commits
Scott Main authored 6dd38cc5343
Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." Submitted the original revert too soon. This reverts commit ebcee19783c4fe5ba776353e95974383850a4685. Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4