Change-Id: I5756b96bcc7563b82e35d3cdfdda3b80692767e5
(cherry picked from commit f3389350)
(cherry picked from commit 2e480f69)