Merge "Handle concurrent exit and wake lock acquisition."
am: 8803d61599

Change-Id: I38e255cf1c48e8b7097c61ad62d775c5b9cdd44b