Reconcile with jb-mr1-release

Change-Id: Iba2b369e6c6e79c79ca38617bb5ff58edcbface2