Merge changes from topic "health_recovery_available" into stage-aosp-master
am: 345bac071e

Change-Id: Ida802a4eae6b860da0ad43e1b6af6dac31f1ef73