This patch set fixes the blocking documentation gate failure for Gluon. Change-Id: Ic1e1b2ea8c65ba9d29940d1e9034857bfc78d0c6