closes #1870 Change-Id: I18a48d2e80872ccc8a0b52a13dbc23b82d1981cb (cherry picked from commit d728233e29) (cherry picked from commit f0198fe58d)
d728233e29
f0198fe58d