Reconcile with stage-aosp-jb-release - do not merge

Change-Id: Idc715a2bf9ea404ec66e8650af77b95af37bb80d