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

Change-Id: I222a30730ec6199a53c91fb6c3fd4b96846ac7d3