* Should be moved to herolte/hero2lte repo. This reverts commit f2d24208. Change-Id: Iafb9284dbc2261c2125360e108512050461186d3