Merge "AOD: Ensure dark amount is set after reinflating" into oc-dr1-dev
am: 70c4a61033

Change-Id: I28bbd1ece0d83a190a38d39ddf8c113ba092454d