
This reverts commit 7a4c39694864871494b677de7784fdac018c62c3. Note this time it sets it to F21, not F22, and gets rid of the duplicate definition that doesn't get exported. Change-Id: I240ad25d7a73c379559517a2a8399ae8c098314b
This reverts commit 7a4c39694864871494b677de7784fdac018c62c3. Note this time it sets it to F21, not F22, and gets rid of the duplicate definition that doesn't get exported. Change-Id: I240ad25d7a73c379559517a2a8399ae8c098314b