Change-Id: I0ad7c02953aa53168dc242f1f374ab871728c84e
(cherry picked from commit 04a84913)
(cherry picked from commit acd0975a)