Merge "Merge "GenericSource: reduce logging." into nyc-dev am: 64cc928 am: 274c4a0" into nyc-mr1-dev-plus-aosp