Bug: 17428908 (cherry picked from commit 8a4064e2) Change-Id: Ica403bef3e7d93bf6e9197c44b77e39683e04d55