Test: I promise that this change doesn't break Android. Change-Id: Idab58ee91412836a514eaca0ef1aa7cc6450bad8