Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b55262 am: 2169197e am: 58555ee8 am: 2e85e2ef am: c92e93c4 am: bb7439d8 Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0