Cleanup #2 for i897

Change-Id: I43164f82578bdc9366e7d3f3612fba43ddb3beb4
Merge "Cleanup #2 for i897" into jb4.2