merge in jb-release history after reset to jb-dev am: 2da3efe1e8 am: 76dacb1f0d

Original change: undetermined

Change-Id: I2e7d6655bbc2433be151afceb29ab9a7005612f7