This reverts commit eca208fae6 and is the first of the LTE commits in master being back ported to the LTE branch. Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
eca208fae6