tree 4617009a18d95cb998683b196e53b3f9d460a2c1
parent 32cdab80ee5c845ba5f6a2920d188a58e3eb19e2
parent 6c52e047db7e1d5173bd1b9fbc1bfc56132900f9
author Yifan Hong <elsk@google.com> 1531935124 -0700
committer android-build-merger <android-build-merger@google.com> 1531935124 -0700

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

Change-Id: I260d9ceb60baa752e173189219967ad4cd9750f3