Cumulative merge to include intellidemand up to https://github.com/faux123/Nexus_5/commit/2dcf6389155a2621b7d32b8bbf4e56568e17a48b