Merge "Color aspects keys information stored database"
am: e4c918ba8e

Change-Id: I86084365ec7d0bc5cd8790cc9b5911c8c3fed63e