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

Change-Id: Ia920bf00dce1ed7e4d80ae75ae1714057607fae7