Merge redux branch (keystone light)

Change-Id: I2cb5b198a06848f42f919ea49e338443131e263e