Update to BETA 2

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