This should have been cherrypicked to jb-mr1.1-dev, not jb-dev. This reverts commit b21190dc. Change-Id: I03b3d59958575a8646c1078ccc3d953a73cce516