Merge changes from topic "keystorebp" am: a12eab69d1 am: 315bbfc213
am: 2461194985

Change-Id: Ibb0723012dd3a2e1a5b12810acd77c0a24292208