Merge cherrypicks of [2686880, 2686702, 2686703, 2686704, 2686141, 2686142, 2686143, 2686705, 2686706, 2686707, 2686782, 2686783, 2686784, 2686785, 2686786, 2686787, 2686788, 2686708, 2686144, 2686789, 2686709, 2686710, 2686711, 2686712, 2686713, 2686714, 2686715] into oc-r4-release

Change-Id: I30679c8adbfda3131fe3db7d44c5f331d5fbda7d
tree: 7fd2dfe27fb8241ad9ef610a37ece5e1d43188c4
  1. app/
  2. doc/
  3. include/
  4. libs/
  5. tests/
  6. tools/