Merge "Data stall intent definition" into pi-dev
am: 88dcad1aa4

Change-Id: Id1b549f662e574695c06d58dc533eafaa257eb3c