Various changes - from M8260AAABQNLZA30165

Change-Id: I0f7fa77616a0400d1b92277c8559427e353f7925