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

Change-Id: Ia87571d271f0dd271b40445b14bba9d05f5b34f1