Not BETA7

Change-Id: I5e698f85a76aa04b29a6be5d13b4d9046edb78b7
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy