Bug:14568468 Change-Id: I56a49a8fbd381b03fcf263d4b72c8039976ca9e2 (cherry picked from commit 26eab643)