Merge changes from topic "libgraphicsenv" am: 943675342e  -s ours am: 23f6b01507  -s ours
am: b90ebc73c5  -s ours

Change-Id: I81dc97434dec0388934d1d52932225ffd0959d47