Merge changes I6b247672,Ie8ea452b,I9ef52453 into pie-cts-dev am: 70030aaec3 am: 524c6f2582 am: cd37a96095 am: 86496d8351 am: 1a3092a068 am: 0095898b85

Change-Id: I0353da5a0f6c85a7d1dbee60a4febdb2a85591ee