Change-Id: I58d15781591fc0a382f55bf53e67e74dd7a08988 (cherry picked from commit 686393c2cd4471cb33d8b7d3e13b285305f1a862)