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

Change-Id: I57eb9aa689174cb830c4d8a7598eea27f484c732