Change-Id: Ibee5fdd8a59b1e06112bc32ee5dad7f1699fae9b (cherry picked from commit f2070db3) (cherry picked from commit ae0c350b)