Not yet ready for this

Needs some more testing and perhaps source refactoring

Change-Id: I5fe2c68af4fa4a02656518d6e0edc4375572bff2
Merge remote-tracking branch 'upstream/jellybean' into HEAD