36cca79ca7
* commit '0a36cec642fb58e295d0608026890d95d0ae3cc0': docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74