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