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