Merge "isReservedSupported=true when running as container"
am: e0076e4145

Change-Id: I8c384d6a250a03b1eeed2b701cc6d17cd85573f1