Closes #2027 Change-Id: I609d326fe69c82268f4e58411549cf26afc68409 (cherry picked from commit aa28864c5d)
aa28864c5d