Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e am: a592e55e5f
am: e06f74af73

* commit 'e06f74af73942d04911a14331993fcea99164e1a':

Change-Id: Id1a7d07db963746fbd4cf1a67ff6c6b9528d51a2