full r1 mako adds, 3.96

Change-Id: Ie51fcb4f0a56486d347eac55b20358398f89361b