Change-Id: Id2416b2b67f7ae62f3d3fbe1ebebeb89edabfc40 (cherry picked from commit 30d7f510) (cherry picked from commit aae3875f)