closes #1575 Change-Id: Ie6f2cb9708c3a9248d763b1a01b4483a0fc81483 (cherry picked from commit 5b24f2340e)
5b24f2340e