Merge "Merge "Fix flags assert in validateProfileData" into oreo-mr1-cts-dev am: d8b66c5f63" into pie-cts-dev am: 128f8fc837 am: bd93575830 am: 52db87729e

Change-Id: I092a77bc0d3fd9dbc7021c29b075a25341514e03