This reverts commit 7bcee86e. This is in preparation for applying the 2016a -> 2016d update to mnc-dr1.5-dev (commit 2880a020) which cannot currently be applied because the 2016b update is present in mnc-dr1.5-dev. Bug: 29528355