4.3 changes
revert 4.3 changes, this is jellybean branch
introducing 4.3