Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev
am: f3f5d79210

* commit 'f3f5d7921073f7976bbab75394554e5fe7992aaa':
  docs: Creating new support library revision history page

Change-Id: I1895793d67d6910c7750439f7d4486fc52fc32c1