4412 4.1.2 master

Change-Id: I6286b123bcbd7ea3fb27cfe1e9ba8704cd8caa0a