[automerger skipped] Merge changes from topic "RenderArea" am: 3b14b7db6f am: 445c7b3640
am: 4fc168050a -s ours
am skip reason: change_id I54ea3fb561ce4f2ea6f48079ad51efdd9984d186 with SHA1 814bf9785b is in history

Change-Id: I525f060872bd4014915e86e54112b045bf9f7ade