Merge "manual merge for N6 FW(7.35.79.100)" into mnc-dev
Prerepa Viswanadham [Wed, 2 Sep 2015 20:52:15 +0000 (20:52 +0000)]

Trivial merge