Change-Id: I51c0d68d763e7cfec7bdc7b18782d66732fb2160 (cherry picked from commit 20cecb7dec7efb35277138bc7fa57704c3757414)