Merge "Building IMSI encryption support." into oc-mr1-dev
am: 94fa7ee972

Change-Id: Ie3f8787de3cdb0db08724f99ee0b52a2ba228d5b