Merge branch 'ibs-for-chrome-platform-merged' into working-branch-for-4.16
authorBenson Leung <bleung@chromium.org>
Sat, 16 Dec 2017 04:54:41 +0000 (20:54 -0800)
committerBenson Leung <bleung@chromium.org>
Sat, 16 Dec 2017 04:54:50 +0000 (20:54 -0800)
Signed-off-by: Benson Leung <bleung@chromium.org>

Trivial merge