146a0b4522
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f': docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74