Merge cherrypicks of [1949776] into sparse-7779620-L15600000954195552.

Change-Id: I78ff672cba4e3e472f4bf4f42ea65c6ad7fb7036
tree: d82c84c3120751035aebc6fd5151e0ebdb2bd385
  1. bin/
  2. doc/
  3. share/