Merge changes I37c8daa6,I5a05b65d,If56347fd
am: 9309f1cbf3

Change-Id: I847aeea3e025d07eb809310dc7dc5ea3ef0fc285