Merge tag 'v1.0.5' into HEAD
am: 885730d69b

Change-Id: I8a23bf0839b2150792db62caaf36c773c5c10546