Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3 am: 155d9ba6fc
am: 3e8f90a62b

Change-Id: Ia909905095094f33c536774235d49060ca2d63c3