Initial commit
Merge commit 'fa00fc64a3690f4c6a344b1a9a6ca3669b0a0654' into lollipop