Merge changes I4dcded81,I25a500a1 into pie-cts-dev am: 11f84715fa

Change-Id: Ia49a215e4ca6afafd05fe5d5b76e2f77bbb3207a