Use correct version code for ICS, and update doc strings. Bug: 7047253 Bug: 6964458 Change-Id: I22e2e66ca8f54e4b757fb5e11363ed28dd20aa9e