Merge "More Instruction Changes For Separate Work Settings" into oreo-cts-dev am: 3df1fae2ff am: 6aa5d35b18 am: af5503ddf3 am: 513690e1a0
am: 331d1af1cf

Change-Id: I3bbde8064b202982675f785d0aa01a7599928bd8