This follows the commit 60ae70dde196191217c8c46242be283c7fd30039. That code has been approved upstream Change-Id: Ibe283886cf81822750db4b1dedfa69cdac1f7e43
This follows the commit 60ae70dde196191217c8c46242be283c7fd30039. That code has been approved upstream Change-Id: Ibe283886cf81822750db4b1dedfa69cdac1f7e43