Merge "Comment out keystore usage for now" into qt-qpr1-dev-plus-aosp
am: 3a333444eb

Change-Id: I52cc7e738495e506023f4dba70259eb55a9dc2aa