Merge "Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f am: a94ecb5b am: 8af05481" into sc-v2-dev-plus-aosp