key layout change

Change-Id: I558e272c2940a5a70cb395876fd74a0a53ddd064