Merge "Remove redundant scan on boot completion."
am: e17e9e942a

Change-Id: I1490841ee8cf1802ebfb1ebe113845967885f176