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

Change-Id: I423a17cfd5b25d4dc7cce7d3191f637bf9106b45