Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE