staging for HTC jewel

Change-Id: Ic28e54f930f70cbfecbdf3f78a9165f17641429b
Merge "staging for HTC jewel" into jb43