Merge "Remove broadcast of NETWORK_SET_TIMEZONE intent" am: 78b90b3a76
am: 1f641b3630

Change-Id: I4d0c201fc6af3826a4427da5bc162c10bef50641