General cleanup for i897

Change-Id: Ib936d6c1312375b423f300aefeabb315ddf1ea86