manually merge changes from jb

Change-Id: I3eb5d3bff89a76371eaad64d414796fbd3106a41
4 files changed