DESCRIPTION

Fix assertion for 4.0 GA

Change-Id: Iaf534a0985274c678fe0add350e8549abb9799bd


COMMENTS

author: Natasha Sullivan
date: 2015-10-13 04:58:07.109000000

Uploaded patch set 1.

-------------------------------------
author: Natasha Sullivan
date: 2015-10-13 04:58:59.840000000

Patch Set 1: Verified+1 Code-Review+2

-------------------------------------
author: Tate Garrett
date: 2015-10-13 04:59:34.498000000

Change has been successfully cherry-picked as 2a2a1b8f6da855411281ecfe6e7cca01997a9a82

-------------------------------------
