Address feedback in review Id545d6cf93227cf1fc2ff0c05dbdceb8fb6aa5b9 as all requested changes were basically limited to tests. Partial-bug: #1559691 Change-Id: Ic414581c145d0e4b94163c9bd2dd4ae160196b28