Merge changes from topic "health_cleanup" into stage-aosp-master
am: 6c52e047db

Change-Id: I260d9ceb60baa752e173189219967ad4cd9750f3