Merge cherrypicks of [2421542] into nyc-mr1-volantis-release

Change-Id: I9bfd38dd0243e80269340eed48e2d256fc65b32e
tree: f868df0de3a4f0f9579525231a6c00531f20aab3
  1. Image.gz-dtb