Kang PIE [2/2]

Change-Id: I71fcda077effd4eb6faf64ad47c612a5e4bfdd66