Closes #2025 Closes #2026 Change-Id: I9f49127725b867b5fc9e9a852e6688e2c1d10b49 (cherry picked from commit 2639d9c0d1)
2639d9c0d1