fix conflicts with merge of jb-dev-mako

Change-Id: I2d8d18232ed02b2c4e3e661544046bf4b8039800