Change-Id: I43e61679acba66b2482b085f0ce3b91b71d067a0 Closes-Bug: #1812221 #1802771 Co-author: Alexandra Settle <a.settle@outlook.com>