Merge \"Don\'t make redundant launch while updating configuration\" into nyc-mr1-dev
am: 4c7b339411

Change-Id: I84bce1a3980bf78eb20f7473b4cee687481d8bf2