Bug: 17917638 Bug: 17917145 Bug: 17931937 Bug: 17933032 Bug: 16899307 Change-Id: Iee9fd0a44cd40b9860cf242cbdaabac409882a15 (cherry picked from commit eff209d2)