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

Change-Id: Ia55817acde7fa0d1a1f0c711363eba4a6f41983f