resolved conflicts for merge of e3d4f6c1 to master Bug: 13348970 Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c