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

Change-Id: Ic5e708f87d87e0e0b11795c2a18fe2128ac3ca5c