Change-Id: I951340eebab35c10efe98dab86b58fe8efada169 (cherry picked from commit 2e37b06dde2dff019b9143fc6b61021dab79bda3)