The bootimage bumps which were part of bug 2095320 include these changes as well. *** This bug has been marked as a duplicate of bug 2095320 ***