PR#3403 (Imported from upstream's e42c208235) Change-Id: Ibcdd8c95604f661055bfb1e91b15fd3686a04c0d
e42c208235
Initial fork from f2d678e6e8 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
f2d678e6e8