cd45de8ba3
Bug: 18550989 Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf (cherry picked from commit 4e389e557efb7806b73d2059d46e2809c1a9f83d)