Merge changes from topic "displayinfo" am: cf66c06c32

Change-Id: I174e073cd5b0423666a3be6d8cac8efbdbd25414