Merge cherrypicks of [2479252] into nyc-mr2-security-a-release

Change-Id: I5f804eb63ddde48e7438f1d1b089f88d06b333b8
tree: eaf8bb1cc2b0e922c771fff0c200656576e754ee
  1. Image.gz-dtb
  2. Image.gz-dtb-eas