Follow-up to 9821ccee. Bug: 28801010 (cherry picked from commit 17fc4bda) Change-Id: I0bbdf83d64ea81e56824aa19bfae3baa341a2b73