This issue appeared in commit 7df886e58d2ff8d9afa9c3bb2112dc74b66c0a7e Change-Id: Icbfaf8481b5b051ec131a21b34558e98ab19ab07