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

Original change: undetermined

Change-Id: Ica0e0339bbb3d1136028a1eb86c13bf185089863