grouper: AICP lp5.0

Change-Id: I4559959ad21f3a9e75d4ea84b874844c6673fb77