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