[automerger skipped] Merge changes from topic "health_cleanup" into stage-aosp-master am: 6c52e047db
am: acfe9ed807  -s ours

Change-Id: I41a44e86738e8adc2aa997201752296c2a487127