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

Change-Id: Ia03cf26cda6069b3969a2d2a2c65cda7e8f1400a