Let package of encryption be set by resolving information am: 78bba113cb am: 62bb93ca6c am: a311e5ae51 am: aa6e309c0f
am: 3e8ba20911

Change-Id: Iade86eea81a8e82bafc83d6c9dd8a1474d909992