Change-Id: I7477fe355419fd4a0a6e2bdda7319abad4c4c748 (cherry picked from commit 834e91ee91d22d74866afbf6252107e969bf8370)