Merge changes from topic "netscan-interval"
am: 9821673626

Change-Id: I4901417f9274ec6580fda72e404ba8d40c12fc0f