Fix issue #8656537: API review: styles, assist

Change-Id: I5542fb548805fc885b51a1dd1133a3ac226df96b
4 files changed