(cherry picked from commit a6da74e9) (cherry picked from commit 7a536531) Bug: 17671501 Change-Id: Id948e3ab22ac988d96f5d370bba8c3f86d08abff