This commit fixes race condition introduced in d047c925af Bug: http://b/27189432 Bug: http://b/22548808 Change-Id: I5d94f130937f18d3443878b3521715a8f87427e0
d047c925af