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

Change-Id: I83ecd5e2d3680120ce2a4b4910690bbc4ed523a3