Merging localdev into master

  * This patchset merges all the code in localdev into master

Change-Id: Ib154f82d9c91cf7bff6310c21f8cf4e236bba9f1