merge in jb-mr2-release history after reset to jb-mr2-dev am: 095035b66a

Original change: undetermined

Change-Id: I8ab1d268ecfd3271cde599b49630b4ae4d566cc0