resolved conflicts for 331f8ee5 to master

Change-Id: I1970a657cf2e775a82b909028065b8f9cc4f5a68