Merge "Remove lots of log spew" into oc-dev
am: e96d66dbc1

Change-Id: I0a32587ddaa359a61b0cdda54effde80dd98a46c