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

Change-Id: I1aa4f633fcbfe5e0bc5309cb68e3d712e1cab08a