changes for 4.3.1 and some other stuff like spelling errors

Change-Id: I794c37cef8e1ef70d21e5f0c0eef1ca6ba5446fe