Presumably that was the intent? Change-Id: Ibfca90041d6913827d2f329bab448afe4d725b46 (cherry picked from commit a933990a)