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

Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
tree: 3f50072672b576bb99eda37859764ea8dde379cb
  1. framework/