Closer examination into D8a13

Jira: SUP-12345
Reviewed-by: Some One <some.one@google.com>
Signed-off-by: Its Me <its.me@google.com>