Merge mako into default

Change-Id: I13c40be80cc8e6fad997e52b557072a0711d69e3
Merge branch 'jb42' into mako

Change-Id: I865dbbf6ef5610d89555ab016e205792d697319b