And also in the ror test. Bug: 28392114 (cherry picked from commit 5bc80b99) Change-Id: I597a2556a81792d7a5289cc4925cb057ee57438d