am 7cca871d: am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from...
am 7cca871d: am 5caa24fd: Merge "Temporarily disable FakeOemFeatures from userdebug or higher builds" into jb-dev
* commit '7cca871d':
Temporarily disable FakeOemFeatures from userdebug or higher builds