favicon

Change-Id: If79e881ee21576bc0291d205b4f5da0ec203f67f
Merge remote-tracking branch 'origin/master' into HEAD

fb0d67ebe3d3ecee6018a833bb3363459a92693c favicon

Change-Id: Ica71fadd64c18bd3ac6fab64d8f2211d5de91c75