I tested these changes Friday evening and looked at CTS results; looks fine. 

This commit needs to be merged.
https://android-review.googlesource.com/#/c/63711/1,publish