(cherry picked from commit 6a594683ec) Bug: 17323719 Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
6a594683ec