key layout change

Change-Id: I580af45a88144f44d83771232a07fe47c8ca0ae3