Merge "Clarify the start and end of scan intervals" am: 111a10c44e am: 696851b904
am: e9b260342b

Change-Id: I5a319647bf0af1ef8be3e7292641e592e9a33819