Merge "Code cleanup." am: a0a1b68fea
am: 3f4eb999df

Change-Id: I9988b95ec1e6b4da648c066cc69d3fe489158423