Merge "Fix Docs breakage" am: 9169e33759

Original change: undetermined

Change-Id: I13429b00c5508fe6c65f64572cdd2f98f97a761b