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

Change-Id: I7e6913e7b88abd1c0fee25d85e889e92fe2ccbeb