am: e5b39f07 * commit 'e5b39f07': Fix initialization Change-Id: Ifc4b70b07e250303cbcbc2a50f2fe7255d7708c5