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

Original change: undetermined

Change-Id: I7de1bb9e2b833c5405e1393b58499509a33f276e