Yuga: Update for lollipop / merge with mako

Change-Id: I7709d33ca06f1126f1fce8d6fce07332fb82329b
yuga: Initial bring up for Lollipop