Change-Id: I0ce48075ad186cf1f9bd3e13fa76269fa9819af1
(cherry picked from commit 3a747453)
(cherry picked from commit 3437713c)