Bug: 16875245 (cherry picked from commit 09107db4) Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893