Bug: 18569347 (cherry picked from commit 2f340a84) Change-Id: Icde3bfdd7c90d51548823ce1f81caf9484de2be5