Closes #1898 Change-Id: I585db2307f750abc18f9918451cab6c6c693965c (cherry picked from commit f443bd8ce2)
f443bd8ce2