Change-Id: I4541b239f490ca0a6edf9698e0d3deaf83669151 (cherry picked from commit 8244abb7aeb768b73682b8c9a26516a9cf06bca5)