Merge "System MR2: Supplement Javadoc for startScan/stopScan" into sc-dev