PR#3014 (Imported from upstream's 22228d2d407763d234a2463f694df77dca8158fc) Change-Id: I23ee7dd6b295c3141fe3f5897673dd932831a4f6
Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)