Merge "documentation fixes" into nyc-mr1-dev am: 14826e5489
am: ec6b2606d6

Change-Id: I4f2682c11384a9f656054b95cfba56132085634a
tree: 8925a9c3c8320bc5438581485bc24f6debd9bd42
  1. framework/