github issue #1656 Change-Id: Ib77bdd3e4b2508c466d7122a9052d1d15d6bc4bb (cherry picked from commit 8e347eb971ad28bd53fd4bfcdbccd0b980e81810)
github issue #1656 Change-Id: Ib77bdd3e4b2508c466d7122a9052d1d15d6bc4bb (cherry picked from commit 8e347eb971ad28bd53fd4bfcdbccd0b980e81810)