Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7. Bug: 17107213 Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47