Merge Broadcom Linux 4.1-1.2

Change-Id: I63d32380c704a2f2a1538a181d713737d6d4fc94