(((AOSPAL OPTIMIZATION)))

Change-Id: I3e79993c44f249b6a15f4f25e1e39057582b21c5