Change-Id: Id85b4709e295453dfd351978096596aef09ce9a9
(cherry picked from commit 85906140)
(cherry picked from commit bd988596)