Merge "Consume design capacity in health HAL 2.1" am: c7b92ea120 am: d6e4da1fec

Change-Id: Ib035de068579c679e191fbfa0a24668f4425f36b