Merge remote-tracking branch 'ls/kitkat' into ose
Merge remote-tracking branch 'origin/ose' into vaosp