- Fix b/10447517 Change-Id: I63ef98c9023cee1a15be61b966aed06dc35e9bd5
- Partial fix for b/10287745 Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455