Closes #1958 Change-Id: I4a08b2f506a68610e378255a545a972e734bc8b7 (cherry picked from commit 4574af06be) (cherry picked from commit c01d9b7769)
4574af06be
c01d9b7769