Last commit before merge, review push

Change-Id: I6b1e1356b803a2732cb286f510b1960adae62bd5