Change-Id: I6f999f36d6ef57dadddd774e6ef60ceb9cb8033c (cherry picked from commit 9affe65c) (cherry picked from commit 3cf3b0e5)