Bug: 16875245 (cherry picked from commit 79bf4007) Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66