merge in jb-mr2-release history after reset to master am: be253713d5

Original change: undetermined

Change-Id: Ic416c564c23fb93f6d8420dbb5919fe4ba4a0912