Merge branch 'BinShrinkOutput_release' into release

Change-Id: If7645c3e24f5d93058262b9f0d9c24ab192ca17c
Merge branch 'release'

Change-Id: I1c486abaca982ccf9713e20656fbfca2b8e67061