Merging 36c65a92d11a865af137b967cc337ec07242f4bd from master and changed
__$version__ to __$VERSION__

Change-Id: Ibfd0e04ce044a10ac64e737ff284034e4180dc5e