Bug: http://b/22850181 (cherry picked from commit 71927a8237) Change-Id: I4a914f0594a66f38efb3026b7ba9d28a4887cb2d
71927a8237