Based on partner feedback Test: Doc only - build-check Change-Id: I30ba539f5baad69aeb6973167067265b22964cc4