Closes #2028 Change-Id: Id92bb615df466fecc3cbd7e774b8096daedd3235 (cherry picked from commit d9fda378e3)
d9fda378e3