(cherry picked from commit 68e70474c2acaf35e42c4656e19d5f35012d0d70) Change-Id: I8f77453d64f1c2c1e974b96c0727616bf0a8bf87