Merge cherrypicks of [2524909, 2524910, 2525349, 2525350] into oc-release

Change-Id: I582aa867aead714f14d18d1d9b0fa43299c8a0ad
tree: 00aedc755d59955c8cd69dca9f66bb2bdb51cc05
  1. bzImage