See more details on why this is need in the referenced bug #1948676 Change-Id: I8a95e80ca74edc8f8f394cefc749c4065a8e0575 Closes-Bug: #1948676