Merge "Not send switch intents if there is no real intent" into oc-dev am: 82331f7f73
am: 09b5ec8ee1

Change-Id: I790378322f543762ef7fda0253e48259e9bf5d3e