Merge "Fix CDM logcat spam when device is nearby" into sc-dev