Merge "Hide periodic scanning" am: ca7544ea15
am: c06722e788

Change-Id: Ie0f3b4d162bec0a501f56f2324fec1c7d2ccbda7