This commit is a follow-up to I6788585a83268e20ff6447e570995871bc9c25d5 Change-Id: I658b6b4eca7978473b08244c349ea5ac8bf37f76 (cherry picked from commit a036728fb4)
a036728fb4