resolved conflicts for merge of 4153a39a to master

Change-Id: I7e2fa9d5a8ebaa653dd4f25b26d68e13e6abaa27