[automerger skipped] Merge changes I8300423f,Idef19c14 into pie-cts-dev am: fa1f0a8382 -s ours am: 7fd9f12864 -s ours am: 074aca8437 -s ours am: e036be53d7 -s ours
am skip reason: Change-Id I8300423fd4351add8db27d1c4586577c98773c8a with SHA-1 fc0c8b7a50 is in history

Change-Id: I0f3a4bf55fe761a8633ca25d13c44745fe80fc6e